[minor] Change directory structure