Moved to new package, it's cleaner