Changed to new data structure

Now there is only one collection for the module types