ui folder renamed and other shit