Cleaned up project to only contain Client logic