Updated Package Structure for npm