Applied review comments for changing the package structure