navigation works, updated the folder structure to match menu