Introduced wrapped class module
Organized in packages
Start using wrapped class