Added HW Dev Tools and Refactoring