Update chprefix to support subfolder
Update comments in headers (partial)