fixed compilation errors due to package structure