Reorganise file structure to reflect app's namespacing.