changed directories storucture more.

Directories were had name of subject.