change package structure, add new models, some changes to existing
models