renamed package names
added models, changed package names