Refactoring the folder structure. Support Unit Tests from ant script.