Folder organization.

Ready to merge after this.