Minor restruct code files.