Got rid of unnecessary files and refactored some more service_template stuff