Rename module hierarchy (fixes #15)