Added code to tidy up project structure