Additional work on ECS refactor. Removed controller objects and replaced them with corresponding components and aspects.