Revert "Fixed bug with incorrect move." It didn't fix anything but accidentially deleted some files.

This reverts commit 6dd9c84525466205b75d5e2d584e7a3d67fac3b2.