Changed the package name and added a correct package structure