Restructure basic organization of core framework