Reworked directory structure