Refactor Entity and begin CollisionBlock creation