Cleaned up folder structures