restructure
move client py