Removed submodule and just imported less file directly