major frameowrk componentes refactoring and simplification