Combined lib and demo app in to one repo.