Placed everything in folders
More folder-ing