Rearrange code, remove stock header.
1 file changed