Modified output with model and field information, some refactoring
Renamed package to something less misleading