1. move logger to index.js
2. Some updates
on work