Fixed packaging and dependencies

Fixed packaging and dependencies