Simplified package structure
Include sources in jar