Split functionality into classes.  Removed more generated files