directory structure refac