Replaced some files, added WCF service code in