WIP: re-structure files for composer auto-loading