Move files to correct place, code formatting
Merge from remote stream-merge