Remove no longer used code
clean up code
separate classes into single files
Change object init sequence to fix nullpoint exceptions