BROKEN COMMIT
restructuring
namespace cleanup