Reaorganize code to mark the release of the first alpha