Enabled on/off options
Updated implementation and tests and removed some unused folders