Removed example subsystem, added our subsystems