Cleaned up and organized folder structures