Restructured the package structure and included it as a non local package