This reverts commit 6dd7bd1160.
6dd7bd1160
Moves folders around to make it easier to navigate the repo