Made a few changes in organization.