Completed the move. Removed all references to 'contrib', place binaries in main tree.