Added ant build filed and restructed test directory