refactor source layout
Merge pull request #3 from rphillips/fixes/refactor_source_layout

refactor source layout