Improved structure of folders and templates.