Added Client, Restructured folder