New version of our java project with a clearer organisational structure