Partially refactored entities for better collision.

Signed-off-by: Jay Margalus <jay@polymathworkshop.com>