everything is moved

lots of line changes