Revert "Attempt at reorganization"

This reverts commit 16c63841c30c7c15460480ded22ef59cbe67cdc0.
Revert "Revert "Attempt at reorganization""

This reverts commit fac80a2b2aa55f250c7eadf4c25b5595c5a51b33.
dot
Revert "dot"

This reverts commit 85c78a4754a5cb1bac9893bf8e5be37a2ac658d2.
Merge remote-tracking branch 'origin/master'