Reorganzied folder structure