reorganised project
cleanup