Changed File structure and added grunt