Consolidated classes

Consolidated into SongQuery.
buildWebPage() outputs the HTML. Need to modify FirstPage to execute the
Java.