More namespace refactoring. Added more L4 classes