layout adjustments, name spaces reorganization