remade the file structure so that it is cleaner