Rearranged some files and deleted others.