Changed package tree to make more sense