Refactor models from providers to models folder