Moved some code from 'logic' module to 'map' & 'entity' modules.