Major reworking of directory structure