More cleanup of directory structure