started moving modules inside the framework