Reorganize file for better reading