Simplified package structure
cleaning up