Refactor place and map migrated to klub