Clean packages, create contract interface for almost every basic classes