 		if !FileManager.default.rs_fileIsFolder(folderPath) {
 			return nil
 		}
+		
 		let name = NSString(string: folderPath).lastPathComponent
 		if name.hasPrefix(".") {
 			return nil
 		}
-		let nameComponents = name.components(separatedBy: "-")
-		if nameComponents.count != 2 {
+		
+		let nameComponents = name.components(separatedBy: "_")
+		
+		guard nameComponents.count == 2, let rawType = Int(nameComponents[0]), let acctType = AccountType(rawValue: rawType) else {
 			return nil
 		}
 
 		self.folderPath = folderPath
 		self.folderName = name
-		self.type = nameComponents[0]
+		self.type = acctType
 		self.identifier = nameComponents[1]
 
 		self.dataFilePath = accountFilePathWithFolder(self.folderPath)
-	}
-}
-
-
+		
+	}
+}
+
+


private struct AccountSpecifier {

	let type: String
	let identifier: String
	let folderPath: String
	let folderName: String

		defaultAccount = Account(dataFolder: localAccountFolder, type: .onMyMac, accountID: defaultAccountIdentifier)!
        accountsDictionary[defaultAccount.accountID] = defaultAccount

		readAccountsFromDisk()

		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
		
