Directory structure change. Deleted test files lying about.