Here is my Workbook 2-1 for my Intro to Java class and cleanup of package structure.