Preparing for restructuring
Moved old Marlin to Deprecated