Moving directories around so it can be supported in Eclipse.

Move directory for exercise 2 one level down, delete test.
Relocate directory structure so Eclipse can handle too.

Move exercise3 one directory down too.