New layout for the code so that it can be directly tested out of a working copy