Version 2 Push

restructure of files, changed the grid