Added missing directory
Added missing dependencies
Fixed execution order and added missing directory