Continue refactoring to intermediate sources