fixed grunt file & fixed folder structure