refactored: scattered files into the appropriate folders.