Reorganize, update readme