Improve project structure.
Structure tidy up