refactoring the structure and content model of this repo