ticket:9 Fixed import & models dublicates