Reorganizes namespace & coding style.