Fixed task dependencies
Renamed
Refactored