Merge "Reordered instructions, - files, + example"