Lots of setup updates
Add additional setup files