Cleanup readme, reorganize helper files