New file structure, grunt tasks