Reorganize and  add some comments
Welcome to the first beta release