Fixed some root folder issues