Refactor directory layout