Updated dependency, restructured packages.