Moving folders to be correct in software.