Some reogranization.
Start using APIs.