More refactoring of source file breakout and types handling