models managing is ok
refactored some code bits.
adapting code hiriarchy.
changed arch