Reorganizing client directories and adding in client test structure