Re-organized the package