Squash commits. Redo folder structure.