Refactoring

Renamed, deleted, moved and reorganized several files and folders to
improve consistency and organization.