slight file reorginization