Cleaned up paths to handle OS differences
Using os.path.join in all the file now