Small changes, directory structure changes.