Back to square one with folders, except models is now src...