Move everything to a single file