[BUGFIX] Adjust folder structure to new package key