Directories are now organized little bit.