Function renames and file reorganization.
Complete file re-org.