Reorganization for better logical structure of files