Reverted Moved UCF class from UCF namespace