Revert init files

The usage of '*' in import is depredicated and may cause conflicts. Though init files are reverted to initial ones.