Consolidated the production and development folders