Added new dependencies
Renamed ant file
Refactored constant names