Restructure

Migrate updated documentation and setup files back into master.