moved modules into subdir