ReOrganized some things