Refactoring invoking of the required files

Refactoring invoking of the required files