Migration to library skeleton. Fix #3