Inlined Framework modules to Framework class, moved Framework to helper_classes/