improve file structure

improve file structure