diff --git a/tvorganise.py b/tvorganise.py
index 3195572..5118da5 100755
--- a/tvorganise.py
+++ b/tvorganise.py
@@ -14,186 +14,174 @@ import shutil
 import ConfigParser
 import logging
 
-def getLogger():
-    lgr = logging.getLogger('tvorganise')
-    lgr.addHandler(logging.StreamHandler())
-    return lgr
+class TvOrganiser():
+	
+	def _getLogger(self):
+		lgr = logging.getLogger('tvorganise')
+		lgr.addHandler(logging.StreamHandler())
+		return lgr
 
-def getConfig(file):
+	def _getConfig(self, file):
 
-    config = {}
+		config = {}
 
-    configpsr = ConfigParser.RawConfigParser()
-    configpsr.read('tvorganise.cfg')
+		configpsr = ConfigParser.RawConfigParser()
+		configpsr.read('tvorganise.cfg')
 
-    if configpsr.has_section('main'):
-        for k, v in configpsr.items('main'):
-            config[k] = v
+		if configpsr.has_section('main'):
+			for k, v in configpsr.items('main'):
+				config[k] = v
 
-    if configpsr.has_section('regex'):
- 
-        regex_config = {}
-        regex = []
+		if configpsr.has_section('regex'):
 
-        # Load in subs before reading in the regex
-        for k, v in configpsr.items('regex'):
-            if k[:5] != 'regex':
-                regex_config[k] = v
+			regex_config = {}
+			regex = []
 
-        for k, v in configpsr.items('regex'):
-            if k[:5] == 'regex':
-                regex.append(re.compile(v % regex_config))
+			# Load in subs before reading in the regex
+			for k, v in configpsr.items('regex'):
+				if k[:5] != 'regex':
+					regex_config[k] = v
 
-        config['regex'] = regex
+			for k, v in configpsr.items('regex'):
+				if k[:5] == 'regex':
+					regex.append(re.compile(v % regex_config))
 
-	return config
+			config['regex'] = regex
+
+		self._config = config
+		return config
 
 
-def findFiles(args):
-    """
-    Takes a list of files/folders, grabs files inside them. Does not recurse
-    more than one level (if a folder is supplied, it will list files within)
-    """
-    allfiles = []
-    for cfile in args:
-        if os.path.isdir(cfile):
-            for sf in os.listdir(cfile):
-                newpath = os.path.join(cfile, sf)
-                if os.path.isfile(newpath):
-                    allfiles.append(newpath)
-        elif os.path.isfile(cfile):
-            allfiles.append(cfile)
-    return allfiles
+	def _findFiles(self, args):
+		"""
+		Takes a list of files/folders, grabs files inside them. Does not recurse
+		more than one level (if a folder is supplied, it will list files within)
+		"""
+		allfiles = []
+		for cfile in args:
+			if os.path.isdir(cfile):
+				for sf in os.listdir(cfile):
+					newpath = os.path.join(cfile, sf)
+					if os.path.isfile(newpath):
+						allfiles.append(newpath)
+			elif os.path.isfile(cfile):
+				allfiles.append(cfile)
+		return allfiles
 
-def processNames(names, verbose=False):
-    """
-    Takes list of names, runs them though the regexs
-    """
-    allEps = []
-    for f in names:
-        filepath, filename = os.path.split( f )
-        filename, ext = os.path.splitext( filename )
-        
-        # Remove leading . from extension
-        ext = ext.replace(".", "", 1)
-        
-        for r in config['regex']:
-            match = r.match(filename)
-            if match:
-                showname, seasno, epno, epname = match.groups()
-                
-                #remove ._- characters from name (- removed only if next to end of line)
-                showname = re.sub("[\._]|\-(?=$)", " ", showname).strip()
-                
-                seasno, epno = int(seasno), int(epno)
-                
-                if verbose:
-                    print "*"*20
-                    print "File:", filename
-                    print "Pattern:", r.pattern
-                    print "Showname:", showname
-                    print "Seas:", seasno
-                    print "Ep:", epno
-                    print "*"*20
-                
-                allEps.append({ 'file_showname':showname,
-                                'seasno':seasno,
-                                'epno':epno,
-                                'filepath':filepath,
-                                'filename':filename,
-                                'ext':ext
-                             })
-                break # Matched - to the next file!
-        else:
-            print "Invalid name: %s" % (f)
-    
-    return allEps
+	def processNames(self, names, verbose=False):
+		"""
+		Takes list of names, runs them though the regexs
+		"""
+		allEps = []
+		for f in names:
+			filepath, filename = os.path.split( f )
+			filename, ext = os.path.splitext( filename )
+			
+			# Remove leading . from extension
+			ext = ext.replace(".", "", 1)
+			
+			for r in config['regex']:
+				match = r.match(filename)
+				if match:
+					showname, seasno, epno, epname = match.groups()
+					
+					#remove ._- characters from name (- removed only if next to end of line)
+					showname = re.sub("[\._]|\-(?=$)", " ", showname).strip()
+					
+					seasno, epno = int(seasno), int(epno)
+					
+					if verbose:
+						print "*"*20
+						print "File:", filename
+						print "Pattern:", r.pattern
+						print "Showname:", showname
+						print "Seas:", seasno
+						print "Ep:", epno
+						print "*"*20
+					
+					allEps.append({ 'file_showname':showname,
+									'seasno':seasno,
+									'epno':epno,
+									'filepath':filepath,
+									'filename':filename,
+									'ext':ext
+								 })
+					break # Matched - to the next file!
+			else:
+				print "Invalid name: %s" % (f)
+		
+		return allEps
+	
+	def _same_partition(f1, f2):
+		return os.stat(f1).st_dev == os.stat(f2).st_dev
 
-def make_path(path):
-    try:
-        os.makedirs(path)
-    except OSError:
-        #print "Couldn't make path"
-	pass
+	###########################
 
-def does_file_exist(path):
-    try:
-        os.stat(path)
-    except OSError:
-        file_exists = False
-    else:
-        file_exists = True
-    return file_exists
-    
-def same_partition(f1, f2):
-    return os.stat(f1).st_dev == os.stat(f2).st_dev
-
-###########################
-
-def main():
-    parser = OptionParser(usage="%prog [options] <file or directories>")
-    parser.add_option("-a", "--always", dest = "always",
-        action="store_true", default = False, 
-        help="Do not ask for confirmation before copying")
-    parser.add_option("-q", "--quiet", dest = "quiet",
-        action="store_true", default = False,
-        help="Silence output")
-    parser.add_option("-c", "--config", dest = "config",
-        action="store", default = "tvorganise.cfg",
-        help="Use a custom configuration file")
-    parser.add_option("-v", "", dest = "verbose",
-        action="store_true", default = False,
-        help="Verbose output")
+	def main(self):
+		parser = OptionParser(usage="%prog [options] <file or directories>")
+		parser.add_option("-a", "--always", dest = "always",
+			action="store_true", default = False, 
+			help="Do not ask for confirmation before copying")
+		parser.add_option("-q", "--quiet", dest = "quiet",
+			action="store_true", default = False,
+			help="Silence output")
+		parser.add_option("-c", "--config", dest = "config",
+			action="store", default = "tvorganise.cfg",
+			help="Use a custom configuration file")
+		parser.add_option("-v", "", dest = "verbose",
+			action="store_true", default = False,
+			help="Verbose output")
 
 
-    opts, args = parser.parse_args()
+		opts, args = parser.parse_args()
 
-    if os.path.exists(opts.config):
-        config = getConfig(opts.config)
-    else:
-        print 'Unable to find configuration file!'
-        sys.exit(1)
+		if os.path.exists(opts.config):
+			config = getConfig(opts.config)
+		else:
+			print 'Unable to find configuration file!'
+			sys.exit(1)
 
-    files = findFiles(args)
-    files = processNames(files, opts.verbose)
+		files = findFiles(args)
+		files = processNames(files, opts.verbose)
 
-    # Warn if no files are found, then exit
-    if len(files) == 0:
-        print 'No files found'
-        sys.exit(0)
+		# Warn if no files are found, then exit
+		if len(files) == 0:
+			print 'No files found'
+			sys.exit(0)
 
-    for name in files:
-        oldfile = os.path.join(name['filepath'], name['filename']) + "." + name['ext']
-        newpath = config['target_path'] % name
-        newfile = os.path.join(newpath, name['filename']) + "." + name['ext']
-    
-        print "Old path:", oldfile
-        print "New path:", newfile
-        ans= "always"
-        if ans == "always": opts.always = True
-        
-        if ans or opts.always:
-            make_path(newpath)
-            file_exists = does_file_exist(newfile)
-            if file_exists:
-                print "[!] File already exists, not copying"
-            else:
-                if same_partition(oldfile, newpath):
-                    print "[*] Moving file"
-                    try:
-                        os.rename(oldfile, newfile)
-                    except Exception, errormsg:
-                        print "[!] Error moving file! %s" % (errormsg)
-                else:
-                    print "[*] Copying file"
-                    try:
-                        shutil.copy(oldfile, newfile)
-                    except Exception, errormsg:
-                        print "[!] Error copying file! %s" % (errormsg)
-                    else:
-                        print "[*] ..done"
-        else:
-            print "Skipping file"
+		for name in files:
+			oldfile = os.path.join(name['filepath'], name['filename']) + "." + name['ext']
+			newpath = config['target_path'] % name
+			newfile = os.path.join(newpath, name['filename']) + "." + name['ext']
+		
+			print "Old path:", oldfile
+			print "New path:", newfile
+			ans= "always"
+			
+			if opts.always:
+				if not os.path.exists(newpath):
+					os.mkdirs(newpath)
+				if os.path.exists(newfile):
+					print "[!] File already exists, not copying"
+				else:
+					if self._same_partition(oldfile, newpath):
+						print "[*] Moving file"
+						try:
+							os.rename(oldfile, newfile)
+						except Exception, errormsg:
+							print "[!] Error moving file! %s" % (errormsg)
+					else:
+						print "[*] Copying file"
+						try:
+							shutil.copy(oldfile, newfile)
+						except Exception, errormsg:
+							print "[!] Error copying file! %s" % (errormsg)
+						else:
+							print "[*] ..done"
+			else:
+				print "Skipping file"
 
 if __name__ == '__main__':
-    main()
+	
+	t = TvOrganiser()
+	t.main()