Moved things around for better use as submodule