Refactoring: Files

That's a pretty nice simplification ;)