refactored files and folders