Removed legacy implementations, and moved code into client folder