Improved entity-component processing. Removed superfluous classes (can
be readded when they are required)