Merge pull request #16 from jameshomunhoe/master

Changed structure
Still modifying the codes for all the structures
Restructered all the lists, changed and fix all the constraints function