moved remaining modules to subdirectories