Move some files around to cleanup my lint