Fixed small issue with new package structure