Merge pull request #42 from joeyAghion/source

@dblock, @anyone: Draft post: Refactoring Infrastructure