Moved some files into other packages and prepared the new S3SyncService job.