update method names and layout
optimize file sync process