restructure folder layout and improve grunt build process