Reorganise file structure to reflect the namespacing