refactor structure for cleaner urls