Removed irrelevant files and changed table names,