Refactoring, shorter folder and class names, using new page tree