Added Mr Handy!

Moved some packages as well