removed empty and obsoleted files
renaming-reordering, fix issue with cached templates in dev