Re-organizing packages and classes