First draft of the module system