got rid of screen_module.h and .c
fixed merge conflicts