moving into lib/
moving things around to make it a gem.