Restructure the project and add the base grid