More folder structure reorganization