removing unused autoload path stuff and relocating model def