Fixing base folder structure