changed the structure to fix the package not found issue