Removed submodules and more intelligent installation script