Revert "revert to original folder structure."

This reverts commit badd529327e02a907c73c6e8f73c23bcf6a9bfd6.
move folder structure
manually change sourcemap file locations too.