.
changed the structure and put everything in classes