Fixing directory structure and fixing response service to return the right content type