restructuring orion to make importing cleaner and easier