Additional modules, renaming, unit tests