refactoring. server splitted on parts
fix in namespace