Add Restart ability
ReJigger directory structure.