namespaces, include directory, cosmetic changes