Updated a few file names, removed modules, added stub for grid