File reorganization: less files