Add ability to move (DOES NOT WORK!)

+ some cleanup

Signed-off-by: Piotr Bocheński <bochenski.piotr@gmail.com>