Separate gui from lib
Change to pkg-based importing