Updated for test setup, restructured startup setup

Restructured to have a feature flag in place
for startup_css