diff --git a/Versions/BeStride_Cata.xml b/Versions/BeStride_Cata.xml
index 22ff7b7..ffbab72 100644
--- a/Versions/BeStride_Cata.xml
+++ b/Versions/BeStride_Cata.xml
@@ -27,9 +27,9 @@
   <Script file="Common\mounting.zone.lua"/>
   <Script file="Common\settings.lua"/>
   <Script file="Common\options.lua"/>
-  <Script file="Cata\bestride.lua"/>
-  <Script file="Cata\MountTable.lua"/>
-  <Script file="Cata\logic.lua"/>
+  <Script file="Mainline\bestride.lua"/>
+  <Script file="Mainline\MountTable.lua"/>
+  <Script file="Mainline\logic.lua"/>
   <Script file="Common\upgrade.lua"/>
   <Script file="Common\bestride.lua"/>
   <Script file="Common\opie.lua"/>
diff --git a/Versions/Cata/Functions.lua b/Versions/Cata/Functions.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/Versions/Cata/MountTable.lua b/Versions/Cata/MountTable.lua
deleted file mode 100644
index 9fd68fd..0000000
--- a/Versions/Cata/MountTable.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-function BeStride:BuildMasterMountTable()
-	for key,value in pairs(C_MountJournal.GetMountIDs()) do
-		local name,spellID,icon,isActive,isUsable,sourceType,isFavorite,isFactionSpecific,faction,shouldHideOnChar,isCollected,mountID,isSteadyFlight = C_MountJournal.GetMountInfoByID(value)
-		
-		if isCollected then
-			BeStride:AddNewMount(value)
-		end
-	end
-
-	for _,value in pairs(C_MountJournal.GetCollectedDragonridingMounts()) do
-		-- With dynamic flying, we can treat any 'dragonriding' mount as a flying mount
-		-- Note that some mounts can steady flight but NOT dynamic fly (ie. Otterworldy Ottuk)
-		mountTable["master"][value]["canFly"] = true
-	end
-end
-
-
-
-function BeStride:AddNewMount(mountId)
-	local name,spellID,icon,isActive,isUsable,sourceType,isFavorite,isFactionSpecific,faction,shouldHideOnChar,isCollected,mountID,isSteadyFlight = C_MountJournal.GetMountInfoByID(mountId)
-	local creatureDisplayInfoID,description,source,isSelfMount,mountTypeID,uiModelSceneID = C_MountJournal.GetMountInfoExtraByID(mountId)
-			
-	if isFactionSpecific then
-		faction = faction
-	else
-		faction = nil
-	end
-	
-	mountTable["master"][mountId] = {
-		["name"] = name,
-		["spellID"] = spellID,
-		["mountID"] = mountID,
-		["factionLocked"] = isFactionSpecific,
-		["faction"] = faction,
-		["description"] = description,
-		["isActive"] = isActive,
-		["isUsable"] = isUsable,
-		["isCollected"] = isCollected,
-		["icon"] = icon,
-		["source"] = source,
-		["sourceType"] = sourceType,
-		["isSteadyFlight"] = isSteadyFlight,
-		["type"] = BeStride_Constants.Mount.Types[mountTypeID],
-		["subtype"] = nil,
-	}
-	
-	if BeStride_Constants.Mount.Mounts[spellID]  then
-		mountOverrides = BeStride_Constants.Mount.Mounts[spellID]
-		if mountOverrides["subtype"] then
-		    mountTable["master"][mountId]["subtype"] = mountOverrides["subtype"]
-		end
-	end
-	
-end
-
-function BeStride:PrintAllMounts()
-	for key,value in pairs(C_MountJournal.GetMountIDs()) do
-		local name,spellID,icon,isActive,isUsable,sourceType,isFavorite,isFactionSpecific,faction,shouldHideOnChar,isCollected,mountID,isSteadyFlight = C_MountJournal.GetMountInfoByID(value)
-		local creatureDisplayInfoID,description,source,isSelfMount,mountTypeID,uiModelSceneID = C_MountJournal.GetMountInfoExtraByID(mountId)
-		if isCollected then
-			print("" + mountID + ":" + name + ":" + spellID  + ":" + icon + ":" + isSummoned + ":" + mountTypeID+"")
-		end
-	end
-end
\ No newline at end of file
diff --git a/Versions/Cata/bestride.lua b/Versions/Cata/bestride.lua
deleted file mode 100644
index 1de27c7..0000000
--- a/Versions/Cata/bestride.lua
+++ /dev/null
@@ -1,106 +0,0 @@
-
-function BeStride:Version_OnEnable()
-end
-
-function BeStride:IsClassicEra()
-    return false
-end
-
-function BeStride:IsWrath()
-    return false
-end
-
-function BeStride:IsCata()
-    return true
-end
-
-function BeStride:IsMainline()
-    return false
-end
-
-function BeStride:GetMountInfoBySpellID(id)
-    local mountID = C_MountJournal.GetMountFromSpell(id)
-    if mountID then
-        return self:GetMountInfoByMountID(mountID)
-    end
-end
-
-function BeStride:IsSpellUsable(spell)
-    if C_Spell.IsSpellUsable then
-        return C_Spell.IsSpellUsable(spell)
-    elseif C_Spell.IsUsableSpell then
-        return C_Spell.IsUsableSpell(spell)
-    elseif IsUsableSpell then
-        return IsUsableSpell(spell)
-    else
-        return false
-    end
-end
-
-function BeStride:GetSpellInfo(spell)
-	if C_Spell.GetSpellInfo then
-		local info = C_Spell.GetSpellInfo(spell)
-		if info and type(info) == "table" then
-			return { name = info.name, spellID = info.spellID }
-		else
-			local name,_,_,_,_,_,spellID = C_Spell.GetSpellInfo(spell)
-			return { name = name, spellID = spellID }
-		end
-	elseif GetSpellInfo then
-		local name,_,_,_,_,_,spellID = GetSpellInfo(spell)
-		return { name = name, spellID = spellID }
-	else
-		return nil
-	end
-end
-
-function BeStride:GetSpellOnCooldown(spell)
-    if C_Spell.GetSpellCooldown then
-		local info = C_Spell.GetSpellCooldown(spell)
-		if info and type(info) == "table" then
-			return info.duration ~= 0
-		else
-			local onCooldown, _, _, _ = GetSpellCooldown(195072)
-			return onCooldown ~= 0
-		end
-	elseif GetSpellCooldown then
-		local onCooldown, _, _, _ = GetSpellCooldown(195072)
-		return onCooldown ~= 0
-	else
-		return nil
-	end
-end
-
-function BeStride:GetMountInfoByMountID(id)
-    local creatureName,spellID,icon,active,isUsable,sourceType,isFavorite,isFactionSpecific,faction,hideOnChar,isCollected,mountID,isSteadyFlight = C_MountJournal.GetMountInfoByID(id)
-    return {
-        creatureName = creatureName,
-        spellID = spellID,
-        mountID = mountID,
-        icon = icon,
-        active = active,
-        isUsable = isUsable,
-        sourceType = sourceType,
-        isFavorite = isFavorite,
-        isFactionSpecific = isFactionSpecific,
-        faction = faction,
-        hideOnChar = hideOnChar,
-        isCollected = isCollected,
-        isSteadyFlight = isSteadyFlight
-    }
-end
-
-function BeStride:GetMountInfoByIndex(index)
-    return nil
-end
-
-function BeStride:GetKnownMountFromTarget()
-    for i=1,40,1 do
-        local info = C_UnitAuras.GetBuffDataByIndex("target", i)
-        if not info then return end
-        local mountId = C_MountJournal.GetMountFromSpell(info.spellId)
-        if mountId ~= nil then
-            return self:isMountUsable(mountId)
-        end
-    end
-end
\ No newline at end of file
diff --git a/Versions/Cata/logic.lua b/Versions/Cata/logic.lua
deleted file mode 100644
index ae96476..0000000
--- a/Versions/Cata/logic.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-BeStride_Game = "Mainline"
-
-local class = UnitClass("player")
-
-function BeStride:isMountUsable(mount)
-	local name,spellID,icon,isActive,isUsable,sourceType,isFavorite,isFactionSpecific,faction,shouldHideOnChar,isCollected,mountID = C_MountJournal.GetMountInfoByID(mount)
-	
-	return spellID,mountID,isUsable
-end
-
-function BeStride:isZoneMount(mountId)
-	spellId = mountTable.master[mountId].spellID
-	if mountTable.master[mountId].type == "zone" and BeStride_Constants.Mount.Mounts[spellId] ~= nil and BeStride_Constants.Mount.Mounts[spellId].zone ~= nil then
-		return true
-	elseif BeStride_Game == "Mainline" and mountTable.master[mountId].type == "zone" and BeStride_Constants.Mount.Mounts[mountId] ~= nil and BeStride_Constants.Mount.Mounts[mountId].zone ~= nil then
-		return true
-	end
-
-	return false
-end
-
-function BeStride:GetProfessions()
-	return GetProfessions()
-end
-
-function BeStride:GetRidingSkill()
-	local ridingSkillLevel = 0
-	local ridingSpells = {}
-	
-  
-	for spellID,skill in pairsByKeys(BeStride_Constants.Riding.Skill) do
-		if IsSpellKnown(spellID) and skill.level ~= nil and skill.level > ridingSkillLevel then
-			ridingSkillLevel = skill.level
-			ridingSpells[spellID] = true
-		elseif IsSpellKnown(spellID) and skill.level == nil then
-			ridingSpells[spellID] = true
-		end
-	end
-	
-	return ridingSkillLevel,ridingSpells
-end
-
-function BeStride:CanWraithWalk()
-	return true
-end
\ No newline at end of file
diff --git a/Versions/Common/bestride.lua b/Versions/Common/bestride.lua
index e9a7391..0e9fd8f 100644
--- a/Versions/Common/bestride.lua
+++ b/Versions/Common/bestride.lua
@@ -222,7 +222,7 @@ function BeStride:ChatCommand(input)
 		    print("Other")
 		end
 	else
-		if self.IsMainline() then
+		if self.IsMainline() or self.IsCata() then
 			Settings.OpenToCategory(self.configDialogs.mounts.id)
 		else
 			InterfaceOptionsFrame_OpenToCategory("BeStride")
diff --git a/Versions/Common/options.lua b/Versions/Common/options.lua
index 0a9e5ab..3773cdd 100644
--- a/Versions/Common/options.lua
+++ b/Versions/Common/options.lua
@@ -519,15 +519,9 @@ local optionsTable_Mounts = {
 
 local function generateMountTable()
     for _,group in pairs({"ground", "flying", "swimming", "repair", "passenger"}) do
-	    print(group)
         for key,mountID in pairs(mountTable[group]) do
             local mount = mountTable.master[mountID]
             local name = mount.name
-			
-			if group == "swimming" then
-			    print(name)
-				print(mountID)
-			end
 
             options = {
                 name=name,