Added all supporting folders and removed machine specific file paths from dump / restore