reorganized file struction