Add files that loosed after refactoring