code cleanup and fix viewer plugin in separated file system