Issue #15. Branch Iss15. Update: Updated module/class names at top level.