Fix project structure for Composer