reorganise repo a little
reorganise some more