change file arrangment

package.bluej

 #BlueJ package file
-dependency1.from=TestPredicateUtilities
-dependency1.to=PredicateUtilities
-dependency1.type=UsesDependency
-dependency2.from=TestSuite
-dependency2.to=TestPredicateUtilities
-dependency2.type=UsesDependency
-dependency3.from=TestSuite
-dependency3.to=TestMathUtilities
-dependency3.type=UsesDependency
 editor.fx.0.height=0
 editor.fx.0.width=0
 editor.fx.0.x=0
 editor.fx.0.y=0
-objectbench.height=101
+objectbench.height=129
 objectbench.width=1171
 package.divider.horizontal=0.6
-package.divider.vertical=0.8007380073800738
-package.editor.height=427
+package.divider.vertical=0.7490774907749077
+package.editor.height=399
 package.editor.width=1069
 package.editor.x=59
 package.editor.y=63
 package.frame.height=600
 package.frame.width=1195
-package.numDependencies=3
-package.numTargets=8
+package.numDependencies=0
+package.numTargets=6
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=130
-target1.x=240
-target1.y=50
+target1.x=280
+target1.y=120
 target2.height=50
-target2.name=TestPredicateUtilities
+target2.name=StringUtilitiesTest
 target2.showInterface=false
-target2.type=ClassTarget
-target2.width=160
-target2.x=10
-target2.y=120
+target2.type=UnitTestTargetJunit4
+target2.width=140
+target2.x=490
+target2.y=70
 target3.height=50
-target3.name=TestMathUtilities
+target3.name=MathUtilities
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=130
-target3.x=10
-target3.y=180
+target3.width=100
+target3.x=60
+target3.y=150
 target4.height=50
-target4.name=TestSuite
+target4.name=StringUtilities
 target4.showInterface=false
 target4.type=ClassTarget
-target4.width=80
-target4.x=590
-target4.y=150
+target4.width=110
+target4.x=500
+target4.y=130
 target5.height=50
-target5.name=TestStringUtilities
+target5.name=PredicateUtilitiesTest
 target5.showInterface=false
-target5.type=ClassTarget
-target5.width=140
-target5.x=390
-target5.y=260
+target5.type=UnitTestTargetJunit4
+target5.width=160
+target5.x=260
+target5.y=50
 target6.height=50
-target6.name=MathUtilities
+target6.name=MathUtilitiesTest
 target6.showInterface=false
-target6.type=ClassTarget
-target6.width=100
-target6.x=10
-target6.y=240
-target7.height=50
-target7.name=StringUtilities
-target7.showInterface=false
-target7.type=ClassTarget
-target7.width=110
-target7.x=120
-target7.y=240
-target8.height=50
-target8.name=ZipcodeRocks
-target8.showInterface=false
-target8.type=ClassTarget
-target8.width=110
-target8.x=10
-target8.y=300
+target6.type=UnitTestTargetJunit4
+target6.width=130
+target6.x=50
+target6.y=90