Several Changes to organization of project code