rename spec files to follow subject
refactor
phase 4