restructured, renamed files