refactoring code

change the structure and _included file