Improve file layout and manager layout.