Imported some namespaces and renamed some old classnames