refactored paths and tasks