Organize directories

Conflicts:
	theme/files/google3028148a0068561f.html
Fix paths after moving directories