Added modules to new structure