Changed imports  due to file name changes and also removed all basic pylint problems (line-too-long, etc.)
Merge branch 'nab_meeting_critique' of https://github.com/simjega/NAB into nab_meeting_critique