Refactored serialization interfaces to correct directory

Added 2 separate stages for optimistic and unique so they can be executed concurrently.