Reworked directory structure.