Move package to ./cl/ to match package name