Re-organized structure of file.