Reorganization of source files hierarchy.