New file structure, less styles, grunt