rename files for easier specs, futher decompose specs into submodules