Organized the package structure