Work in progress
Move everything in the package besides the wrapper script into a single subdirectory