directory rename & refactor