More refactoring. Removed Artemisd dependency in favor of hand spun entity system.