Updated so that ant compile and ant jar generate files correctly