refactored files and directories: