Further templates reorganization