Search bar works on other pages

Some files moved around for reorganization.