Startup Shell Section + Reorganization