Start laying out Ocean module
Cleanup