renamed files and refactored code