Replaced 'import *' and import of variables by import of modules. Some code refactoring/reformatting.
Replaced 'import *' and import of variables by import of modules.
Some code refactoring/reformatting.

tiborsimko/invenio,inveniosoftware/invenio,tiborsimko/invenio,inveniosoftware/invenio