Adding missing json file
Moving sensors to a more logical location
Re-arranging tests and refactoring names of sensors to be more sensical
Breaking out services to better improve readability