Removed lots of old files and categories from the project. Corrected code to now use the tag values and searching to find services