Organize files
fix a tips-string bug