One more moderate solution
Moved to own dir