Eliminated group and step classes

Incorporated them into the main bosch class