clean up warnings by adding annotations
moved factory to tima
Created package for all models
fix