Big refactoring into folders
More major refactoring
Stuff that didn't get deleted in last commit