Clean up opal/stdlib hierarchy