Reorganize. Update Readme. Solve a couple problems.