Reorganize

Update README

Tests and other stuff