Added dependencies, fixed issues with package naming