Reorganise structure of repository - src directory