More cleaning up and bit of work on shop

moved some of player and monster logics to separate controller classes