Removed submodule, improved installer