Moved entities to separate package & fixed minor graphic glitch