renaming model
some changes
not important in private.xml
jani na kisu

conflict dur kortasi