Reorganized and cleaned up files.