Moved out atom creation logic to a separate file.