Tidy up and add the shell and base modules