reorganised dir, outlined MapPanel