Reorganized the package structure for better ease or use.