Moved some files around to better places
More bootstrapping