Rearrange files to avoid an import error in py3