js/css reorg and bundling