Restructuring Model Module in OOP fashion