Commit f642a5fa6c42b145574593a0e18815dc74d3c617

Behdad Esfahbod 2019-06-19T16:36:09

Restructure code