Change structure of Framework

Changes includes naming conventions and programming style.