Move six to submodule