Updated Hardware-ID relations and spec
Misplaced Location.jfspec file
Added Location with ID