File rearrangement for code style