Moved to consisttent folder naming with previous versions.
Moved to consisttent folder naming with previous versions.