changed the package structure and commiting the same