Rename wrapping class to make class name Catwalk available - #12

The class name Catwalk should be used for the application
 class.
Revert "Rename wrapping class to make class name Catwalk available - #12"