Combined two classes into single file

due to inheritence problems - something with class vs modules.