Added serial_wrapper implementation, cleaned up directories a little bit