Added index grid to form. Moved files to the correct directories