More files and updated code for the module