Slightly reorganized folder structure and the way routes are added