Added modular directory structure.