Move .h -> .hpp
Comment and brace adjustments