Updated package files with dependencies corectly implemented