refactoring - mostly 'import *' - continues ricardinho's commits