folders removed, renamed, uva added