* folder naming fixes.