Refactor classes
add keyboard constants