Updating Index in cause of the new names
Outsource includings and new namespaces