Reorganized project to approximate the project directory structure suggested in a few StackOverflow threads.