Move bootstrap functions to separate files.
Split some of the functions into small sub-functions for reusability.
Other cleanups