Revert back to original structure (without client/server dir that DartVoid previously required)