Changed the package structure as per the contents