First pass at moving all the tests into the same directory
Moved all tests into the same directory, but split them by type.  Have gradle running all the tests in the correct order (unit, functional, acceptance).