Restructured files to use ant. Started on API client