packages renamed
entities hierarchy v2
maps hell is reduced