Fixed up project names and namespaces to make layers clearer.