more subdirectory reorganising