Moved ServiceTypeParser to new package