Moved code around a scoche
Updated README