Restructured the FilesSynchronizer