Combined prompts into single test case to allow for students to have them in reverse order
Moved test cases for Assignment1 to their own package
Fixed package names in .java files