Files refactor

Here are my changes...