Examine the API 
Move non api classes to internal packages