Refactored common template file
Re-org