Reorganised project directories to be able to better manage