reorganized file structure