Reorganize and rename demo files to work with moveit
Allow user restarting, for the case that the block detection fails
Comment properly and other minor tweaks to improve pickup