Pushing latest version of code

Some files renamed, n-gram processing added to classification process,
database populating included.