refactored file names to make sense with current structure