Improve folder structure
Clarified function and parameter names