consolidating package. renaming class