refactor for clarity
rename files for clarity