reorganized file organization to improve flexability