grunt working. Some structure changes