Some preparation for new file structure.