Merge pull request #371 from hynek/move-to-src

Move package into src