Included check and better move

Took checking part and cleaned it up - we want everything green. And tried to re-implement moving package using already existing api calls to make handling metadata easier.