Move non-exported modules to subdirectory