ExtractCommand: Fixed condition.
Code files moved to correct locations.