Move internal classes to public (fixes #51)