Fix for structure of module