Fixed Issue #1 and package structure

@jcneally

Fixed the problems in issue #1 that were present in the last pull request.