Moved sources to GIT and made some edits.

Now version 3, Two options are presented.