[Master] Refactor so that all tasks are in main. Better convention