Fixed bugs from name conversion. Moved modules into the directory 'modules'.