Fixed up tests.
Moved src to scratch-java module
Added rest and servlet scratch projects from designer-scratch