did some modulizaation andnavigation