Moved stuff around to make it simpler to locate the different versions.

Unit tests always test the beta version