Reworked layouts of files added namespaces