did some refactoring, started coding the classes code generator