refactored and renamed files