New module format + remove white space

Rename for the new module format and remove whitespaces from the model file