Re-structured packages and added star + analysis