rework file structure to composer