Removed curl dependency and changed directories