Add basic movement & cleanup code

_refactroing the objects
_ add a basic movement