Update alpha, rearrange files