0.8.3.7 release update and some structure modifications