Use packages instead of raw key bindings where appropriate
Remove redundant blank lines
Restructure pages

Add a separate page for search packages