Changes imports due to file name changes and also removed all basic pylint problems (line-too-long, etc.)