Restruct simple modules into packages