refactored directory hierarchy
Refactored directory

Refactored directory hierarchy and added probabilistic dir.