re-organizing models on my way