Improve logging, index path creation
Use module style import