Remove sql from cli
Rename tables prefix and check if exists
Reordering and cleanup