Cleaned up the directory structure and file paths to remove spaces