Moved ui folder into lib/ui