Simplified the package structure