Changed enemy movement

enemies move by a delegated event within the different maps
More conflicts and stuff