Refactored files to Dsync