Moved everything to a folder. Need to clean up our repository and rebase