Feature: Overhaul dir structure.