Cleaned packages
Started implementing the type resolving for instances