Changed file organization and merged navigation with questions