Missing files and refactoring