More reorganization

We don't need no. Extra Files.