Ok moved files around, trying to get import vcs to not fail