Reorganised project and reduced namespace usage