Move srcs back to top level
Merge pull request #122 from dstockwell/top-level-srcs

Move srcs back to top level