moved client & server dirs into app dir