Renaming/re-organization

Updated minor things. Changed name of main file. Added the ability to
tell program which database to use.