Removing misplaced directories, moving misplaced HW into the HW directory