Reorganised project and added Composer descriptor