Reorganizing of package structure and ANT build file