finishing the grand rename

got rid of almost all of the nested classes