Version with screen sizing and changed directory structure