more refactoring in structure of files