Folder restructure and composer integration