Modified the include structure. Also beginning work on Analysis
framework. Much more to come.