Module path and code-style updates