Updated code to match wheelhouse repo, fixes for paths and better reordering
Adding backup of old code