moved files into class files and dealt with screen offset