Move code into a single file