Move most classes to internal package