Some cleanup of directory structure