Remove unnecessary directory structure