Reorganized some directories and deleted some files.