Fixed some folder issues