moved modules into subdirectory