Improve logging
Refactor preparing packages from scratch