Revised the init script
Revise the script
Merge previous changes
Merge pull request #31 from xuy/xuy-file_reorg

Reorganize files with consistent style
Merge remote-tracking branch 'upstream/master'