* Refactoring Architecture to OO Style