Minor Changes.
Restructuring