refactor v0.0.1 / added missing modules / patched to v0.1.0