some changes.

some changes in files organization.