Removed __DIR__ constants from Commands