moved models to separate folders instead of a container class