Moving types into main package rather than making cyclic package dependencies.