Refactored file names and code