Changed package organization