[Refactoring] refactor Viewer package

factoring unused h files