assets reorg and fix javascript