Reorganised project to also include new Server package