KPK commit + major dir changes
Major Update