made the structure more conducive to eclipse

feel free to undo this if you dont like it.