Packages updated to follow DW recommended structure