Refactoring: Files

Ok!