Moved import statements in templates as requested in the code review