Updated to use @holman's bootstrap script and structure
Moved towards a @holman style of loading files