Moving everything to one file