Rename and layout

Commenting in where code will go.