Refactored convert_org into multiple files based on function with their own tests