Switched to grunt for builds, rearranged folder structure