Many changes to struture and new nav
Merge happened