Start dividing the old file in a better structure