Move testframework out of water.
Enable testng again in the 'src/ng' directory.
Simplified xml config to include everything in the package.