Sort everything into modules