Model redone
added package structure
Small modifications
Began testing writing to xml