Inspired by the patch from Alexander V. Chernikov.
Adding some files that was accidentally removed (instead of moved) in cleanup part 2.