tried to clean up my mess with submodules