Added better output dirs