structural changes

Addeded more folders for organization.