Update structures

Separate class
Move function into class