Refactor some files.
Watching process.
Fixed #2