Refactor: Moved the wrapping code to the package 'wrapper'.