Rename package generator to creator
Fix typo
Move target logic to Map class