2013-12-09 re-organized hw source