Move org file into separate file