class header and body path renamed