Refactoring

Project names change, path change, namespace change