Revamped directory structure