Moved files around

Easier to use as a submodule!