Refactors package structure.
Fixes compile error on Java 7.

Refs #105