adjust dir struction and modify Config class