Updated File Structure in some files
Adding New OOP Structure