Moved display and keyboard into separate files