re-organized dir structures