Docs app refactoring begin