Revert "Clear up repo for total remake"

This reverts commit 908668e4328ea6b299061b71646e7d6f323eb857.