Restructuring to include runtime
Cleanups