added grunt, moved some files