Further refactoring of base creation, changes to general conventions.