More structure and organization added.