Broke out templates using blocks
Small reorganization