Move UCP module templates to correct directory.
Remove additional corner spans.
Fix category list padding issue.
Use new sql_return_on_error method instead of setting property directly.
Remove unused files.