Minor refactoring. Adding move_to_special_folder method to help with internationalization.
Merge pull request #46 from wengzilla/master

Proposed solution for a few issues...