removed redundant check against where.isEmpty

corrected wrong package being used, updated files to use correct package.

removed few instances of table name not being correct formatted.