moved modules into a subdirectory