Refactoring and reorganizing krnextgen and rad files.