added Grid structure, moved some files around