diff --git a/pym/cl_kernel.py b/pym/cl_kernel.py
index 7a4dbd1..db40345 100644
--- a/pym/cl_kernel.py
+++ b/pym/cl_kernel.py
@@ -14,21 +14,19 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "2.2.0.0"
-__app__ = "calculate-builder"
 
 import os
 import re
 import sys
 import traceback
 from os import path
+from cl_builder import DataVarsBuilder, printNoColor, __version__, __app__
 from cl_utils import process
 from subprocess import STDOUT,PIPE
 from cl_print import color_print
 from shutil import copy2 as copy_with_perm
 
 from cl_kernel_utils import KernelConfig,InitRamFs
-from cl_builder import DataVarsBuilder, printNoColor
 
 from cl_lang import lang
 
diff --git a/pym/cl_kernel_cmd.py b/pym/cl_kernel_cmd.py
index f6f6cdb..5033cfd 100644
--- a/pym/cl_kernel_cmd.py
+++ b/pym/cl_kernel_cmd.py
@@ -14,7 +14,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from cl_kernel import cl_kernel, __app__, __version__
+from cl_builder import __app__, __version__
+from cl_kernel import cl_kernel
 from cl_opt import opt
 from cl_share_cmd import share_cmd
 import os