Changed from submodules to subdir