Extend/rearrange files

rearrange files for convenience