Merge marina project in subdirectory marina/