Simplify package structure