Clean up dashboard controller code layout
Clean up navigation controller code layout
separating module declarations and naming conventions