Major Updates - seperate folders for indent and format