Change the basic directory structure, and update the templates