Fixed the issues with the package structure