Modified: imports and packages
Moved: Helper classes for empty Files into their parent classes