Revert "Merge pull request #236 from nschonni/move-to-src"

This reverts commit 0f21d98b97c69bc6aea6c42cc557ed5068971fd2, reversing
changes made to 9b444f4e79f2929a37363792027b069bc17f1274.