* bugfix table names
Merge remote-tracking branch 'origin/master'
* remove unused directories and files
* modified