pages moved to sub directory, refactoring