Moved files around. Got rid of submodules.