cleanup of package/class structure