Rearrange files and switch to OASIS