formats moved into separate package, cleaned up, started tests