Move key classes to main package