Simplify class and package structure