rearrange files and add config.xml