Sort out directory structure