changed file names and paths back, cleaned up bp-grid