almost finish the OO style
finish the conversion to OO style

now the project is constructed on the OO style.