prepered an input handler
renamed two classes