rearranging test files and adding Ant build file