Cleaned packages, refined API