Revert "Moved files around, into working project upon cloning"

This reverts commit 21445fbe700e9c817d8b222cbc3e5c3f6f10781d.
Test