Cleans up layout

Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>
Adds rudimentary search support

Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>