Revert "Separated Entity Locations from Asset Pack"

This reverts commit ac2bec1d14740262830aad4060feb7268a9b544c.