Restructure StashClient for easy usage
Fix conficts