Merge pull request #32 from ororo/master

Fixed some error in plugin/service removal
Restructured Modes
Moved Templates
Resolved conflict