code organization: rename files

Hopefully more clear.