reconfigured directory structure, grunt file