Trying to make new structure
Making a lot of changes, but...
I don't know if any of it works.