Move Gen6 stuff into a proper location.