descriptors refactoring
projects structure refactoring
fix