Re-organizing packages and inheritence