Made some changes to setup process.
Made exports / requires more consistent.
Cleanup