reorganized file sctructure