re-work directory structure