Cleaned up folder structure.