Folder restructure and composer