changed directory structure and links