New pash for user.env.sh and cleanup trap
Remove need for additional script sourcing
Comment visibility
Reorganize files into a more sensible directory structure
Fixed paths in scripts and config files
Fixes exit of shell after first-run.sh