added OOP solutions
Revert "added OOP solutions"

This reverts commit a92b7d8336ce635df62af561a00deaf94da49f44.