Rearrange files
Create persistent module