Directory refactor

Change directory clearly.