improve: new structure for inclist directive. refactor: overall code refactoring