Restructured some files.