Now better code with Beta 0.6
Refactor, Rename, Rewrite and many other changes in code