Working class structured code. Changed format of some dependencies in CMakeList.txt.