Merge to master, file and directory cleanup.