Fixed imports paths. Fixed model naming