move rshape to other folder
some changes