Nav routines as modules

First step at cleaning up navigation by converting extra navigation routines to modules (#48 and solving #47)