Moving model entities to their own package
Replacing global repos by model object with repos