Changing files organization for theming function