Add the UCP module and setting
Delete contrib folder