Refactoring Sources. Closes #12