removed superflous dependencies and refactored package