Fix tests; move files; ui folder