Move old code to different file