Reworking everything after some thought
Apparently the new files werent added...