updated package structure
compilation error fixes