clean up directory organization for themes