Changed internal project file structure to be more organised