Re-organize the directories to accomodate version 2, update README