v3.1.7

Complete Restructure. Check comment notations