Move everything to one file