Remove trailing whitespaces.
Reorder each files.
Merge pull request #13 from ChoiZ/dev

Update configuration files