sub projects structure refactored