Bugfix: some imports in wrong locations