Did some Organizing... Started Work porting client to new format...