Removed conflicting templates

Deleted module templates and added the display logic stuff to the theme
files instead