Reorganise structure: finish off main directory