Added code for subsystem, need wrapper class

Removed some unneeded files