Re-arrenge project namespaces and changed Type names