moved back to single file
moved back to single file
providing a simpler API
updated