Re-alignment of folders..template looking good