normalized the file structure and organization