ExtractCommand: Fixed condition.
Code files moved to correct locations.
Merge pull request #1111 from am11/master

ExtractCommand: Fixed condition