Refactor location of directories