Add tricky OOP version
Rename folder