Adapted composer to new layout of modules