Major changes to framework structure