Rename a couple of files to be consistent
Implement simple CWB search and make it default