Moved the  Model code to specific folders