Syncing files, updates on new layout