Change code, reorganize, cleanup.