reorg attempt
and more dir moves
got r.js optimizer working