Reorganise folder structure into a more manageable format for refactoring