fixed imports
refactored gen model linker