better structure and files