package name refactoring and added a TODO