separate & rename files (refactoring)