Design for OOP

Modified the file structure for OOP