Move existing files into 5.4 tag