Added labels for when x off screen, changed directory structure