DEV: merged and renamed files