Fixed now safe to re-run multiple times
Clean up init all safe to re run now ?
Fixed up inital folder setup